bitkeeper revision 1.1236.2.1 (421d97a5SR1YbOvnVv1vbOXHzoiZ4Q)

Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

diff --cc tools/Makefile
index 4e590fd30bdabfd2dec5171891b6b2f20b378fac,0140f8baae3890040abab7f3bff0eff6aba1a797..26b74babd06adf2e03a6d0c60fec92778ecb9ee3
--- 1/tools/Makefile
--- 2/tools/Makefile
+++ b/tools/Makefile
@@@ -21,10 -19,9 +21,11 @@@ install
        $(MAKE) -C python install
        $(MAKE) -C xfrd install
        $(MAKE) -C sv install
 +      $(MAKE) -C xcs install
 +      $(MAKE) -C ioemu install
  
  clean:
+       $(MAKE) -C check clean
        $(MAKE) -C libxutil clean
        $(MAKE) -C libxc clean
        $(MAKE) -C misc clean

diff --cc tools/libxc/Makefile
Simple merge

diff --cc tools/libxutil/Makefile
Simple merge

diff --cc xen/Makefile
Simple merge